Merge commit 'upstream/0.2.0'
authorAsias He <asias.hejun@gmail.com>
Sat, 19 Mar 2011 01:55:28 +0000 (09:55 +0800)
committerAsias He <asias.hejun@gmail.com>
Sat, 19 Mar 2011 01:55:28 +0000 (09:55 +0800)

Trivial merge